Cleaned. Do some plot cosmetics.