Fixed checkstyle warnings 2