further cleanup, commenting, header files