a little clean up
changes
merge