Cleaned up main header file