clean up some identifiers
Merge branch 'master' of nodozegithub:nodoze313/jovi