Commented code, cleaned up, continuing with day 2