Again Refactored

Following TDD
Refactoring

TDD is all about making small small changes in intial phase