Refactoring with 'after' plus fixes