docblocks
restructuring and renaming