Add whitespace between classes/functions to match pep8.
Update function names to match pep8.
Use dict.get() to avoid the iterating regex.