20 tests passed, cleaned up code