use single quotes and clean up comments