refactoring because of checkstyle warnings
refactoring due to checkstyle warnings