Refactor to clarify some methods.
Cleaning up linted output
Update readme.