Cleaning up, thinking about interfaces;