Header cleanup
Updated composer