Simplifying Header instance construction
Cleaning up imports