refactoring "done" for now