Refactoring and Docs.