did basic refactoring