Cleaned up Header
Simplified