code cleanup. still passing