project cleanup and improvements