CLEANUP some renames, comments and rearrangements