Modularized the header