Adding some scaling
Cleaning things up