refactor 0.1.5