Continuing to Clean and comment Code