Simple clean-up of code and text