Working Header! Cleaned up code