Adding closing semi-colons
Switch to centralized config module
More effectively manage Header