uncommented code and removed excess spaces