Cleaned up header syntax & comments