Expanded some if's that the ide generated so that there is a chance that a human could read it
Renamed the wrapper to something a bit shorter
Switched to using a static method for header names.