refactor 0.1.3