Refactor out an ugly conditional
Style and formatting
Method compaction
Move a parameter into an attribute, consolidate some methods