Fixed formatting and removed commented out code and extra method.