Header refactored and fixed