#71 Refactoring