Refactoring & timing