Moved commonHeaders to a more obvious place at the top of the class