Removed white space and commented out code