More scale refactoring