Refactor variable & method names.
Move local variables into code block.