fix some more linty /code layout issues