units place refactoring