Code cleanup, consolidation of options, see #56, see #93.