Refactoring 0.103