More cleanup of interface