Random code cleanups/renames/tweaks/etc