removing commented code and corrected indententations