Refactor and continue #71