Fix checkstyle errors & inspector warnings