Refactor. #73