minor cleanup and language clarity