Cleaned up the interface a bit