fixed style
Merge branch 'checkstyle-fix'