PEP8 and variable name cleanups
Add initial (poorly written) unit tests.