Fixed chceckstyle issues