cleaning up api details