Card #479 - checkstyle