cleaned out comments and reoreded methods