clean up, refactoring