Refactoring #195