Small improvements and clean-up