Code-quality clean-ups