Refactoring using Strehler 1.1.10