Day 21: Cleaned up code