Card #147 checkstyle