Remove use of MAXWIDTH and MAXHEIGHT

They're unnecessary since the screen resolution is fixed.
Also made a couple of other minor tweaks.