Removed space and unused comments