Cleanup work
Cleanup work

Mostly improving readability, no major functional changes to the code.

imalsogreg/orgmode-parse,imalsogreg/orgmode-parse,nushio3/orgmode-parse,digitalmentat/orgmode-parse,digitalmentat/orgmode-parse,nushio3/orgmode-parse