Refactoring: issues #14, #15