Code cleanup for the day