clean up and some cosmetics.