Clean up, added presentation.