Quotes and some cleanup