Refactored - worth it? (exra calls?)