Cleaning up the exposition