House Cleaning

Added comments and cleaned up a little bit of my mess