Fix checstyle issues