refactoring (cleanup)