a couple code cleanups