[TASK] Cleanup to docblocks and code

Renamed some variables, fixed some FLOW3 uses, added/tweaked docblocks.