removed white space and unnecessary code