Cleanup and spelling mistake corrections