General cleanup, comments, and adds single quotes.