Refactoring
new question done