Minor. Reused util method.
Minor. Fixed misused class.