Fixed style, removed commented out code. Passing 22/35 tests, will finish the rest tomorrow.