A smal cleanup