Refactorings, docs, etc.