First attempt removing headers and adding pads here and there