Fixed formatting and removed commented code