cleanup and spelling fix