Cleanup!  fixed typos, and shortened

Got som advice from Toba