Cleaning up.
First cut.