Cleanups and improvements