CE-297 small refactoring and filling documentation