Fix checkstyle issues & remove debug messages