refactoring
fix scale issue