.h file cleaned up, formatting, commenting