Refactor after merging pull request #10