Refactoring (issue #24)