more clean up, renaming and documentation