Adding questions 14 and 15
Refactoring organization