Cleaned up api.