cleaned up api more