Removed whitepace and unnecessary comments