Cleaned up the interface slightly.