Refactoring from Good to Great

Code Smells