Refactoring 0.104