Code cleanup
Change default scale