Refactored Code : Day 1