Updated to fix checkstyle errors