refactoring 0.1