Various cleanup. Adjusted scale and removed anti-aliasing