changes, refactoring