Refactoring and project finalization