Checstyle issues fixed.