Clarify a few spots
Replace draw method generator with regular return