Bugfix/ocd quotes

General clean-up and fussing over code style.