Refactoring
ref