misc cleanups/tidying