- Use context variables for drawing functions. - Move conditions to functions drawing specific elements as preconditions - Disentangle calculation of common coordinates. - Use more descriptive variable names (in context at least) Individual drawing functions are mostly unchanged, so improvements there are minimal. No intended functional changes.