Deleted Spaces and Clean Up Code