Updates to readme and small refactoring to clean up naming