several varable name changes
clean up