refactor 0.1.1