Refactoring per review