Fixed indentation and removed commented code