Fixed indents and removed commented code