Clean up header
Unlimited width closes #3