introduce minor changes to overcome CheckStyle errors