Reducing most code by a tab-level; refs #7