small update and clean up