Day 2 Code drop (minor cleanup)