Compiled all header logic into one class
Added some style changes