Refactor. #50