Cleaned up API.