Some refactoring
refactoring