Tidy code
Move header delements inline