Addressing checkstyle/warnings