Refactoring library methods, revised readme docs.