Tried to clean up the interface.