Refactor (#42)