Make all tests pass, code cleanup