looks good. Time for some cleanup