Minor refactor
Refine API feature to be readable as spec