Small improvements to aesthetics