continuation of code cleanup, merging header files