Cleaning up and fixing a bug with the scale