Day 7: Updated comments and code cleanup