minor code cleanups.