Small cleanup, consolidation, and improvements