CLEANING UP SOME CODE