Refactoring + fixed all test failures