Hide internals, clean up.