Cleaning usings
Simplifying header method