bit more cleanup in header