Cleaning away whitespace/commented out code