Refactoring

A complete refactor to clear the test and to implement what i have
learnt and to get ready to start building….