Cleaning up and clearly defining a sane interface.