polish api/remove redundency