Last refactoring of the week