Refactored Code : Day 2