Correcting Checktstyle issues