refactoring, docs, settings