47b3ad1387
* remove duplicate calculate-active-index calculation * make codebase a bit more consistent * remove duplicate resolve-prop-value