Reorder commented code, update header file documentation