Refactoring according to checkstyle configuration
tmp