much better: renaming done, file/func reorg done, comments added and improved output as a result.