removed whitespace and unnecesary comments