Improved code "quality" according to checkstyle