more review and some renames
more review