Minor code cleanups\