Some Checkstyle fix & translate