Fix PMD and CS