Cleaning up internals, allowing for more flexible interface options