Remove comments and fix scaling on device rotation bug