Cleanup MapScreen + Map drawing code.