fix checkstyle format
Merge branch 'feature/formatters' into custom