Review and improvements