Cleaned up header for push to marmalade