Streamline and simplify.

Coming soon.