Small cleanups/import sorting