Cleanup after refactor (documentation, etc.)