More words and clean up