Code cleanup for days