finished refactoring entry