Remove some uglyness