Headers are now more programmer friendly, I guess
Moved header definitions to constants
Flattened handler.go code a bit