adding missing apostrophs

and cleanup