Continued refactoring, documenting.