Refactored Code : Day 3