Refactored headers for style