Completed scale implementation
Refactoring