clean up and style changes

clean up and style changes