Finalizing refactoring