tidying up api manager