NO-JIRA: cleanup/fixups/formatting