Improve presentation and spelling