Clean up some cosmetics