fix CS & PMD