Cleanup some untidiness