Cleaned up interface a bit.