clean up and some polish