refactor day1 complete