places refactoring