cleaning up the feature api