Refactoring
merged