Refactoring after code-review #1
Refactoring after code-review #2