removing commented code and formatting the code