Cleaned up header files some