Refactoring #39