Removed unnecessary header guards
Refactored some things
Suck point