Refactored Code

Refactored to add ENUM for Day and formatted the code and repackaged as
production and test code