Close #9 - Refactoring done