yh-196 started merge
yh-196 flake8 fix
yh-196 using helper function & custom json licenses