refactoring, additional composition test, utils documentation
Cleanup/refactoring/documentation