cleaning up
further refactoring, add documentation to match concatenator