Commented and improved methods in utility class.