Small cleanups/revisions