Prettiness fixes