Test function to DRY up header initialization
Dry up code
Update comments