minor clean-up and updated