Tests pass. Need to do some cleanup