Removed commented code and converted spaces to tabs