Refactored body and header