Fix cs and using statement in several files

| Q                    | A
| -------------------- | ---
| Bug fix?             | n
| New feature?         | n
| Specs pass?*         | y
| Checkstyle issues?** | y
| PMD issues?***       | n
| Fixed tickets        | -
| Doc PR               |