A small cleanup - renames, comments, moves and shuffles.