final changes

clean up and simplify