Refactor. fixed #67