Checkstyle compliance and warning removal for util package