comments and consistency name changes
comment and free memory