Refactored body