Some general clean-up