Clean ups and improvements