Added spaces and removed commented code