Cleaned header files a little bit