First postFinal refactoring