Refactoring: issues #4, #12