More minor code cleanups