clean-up and spelling