Code maintenance: cleanup, minor changes
Code maintenance: cleanup, minor changes

Sputuks3/kanzi,rzel/kanzi,Sputuks3/kanzi,rukistar/kanzi,Sputuks3/kanzi,sharkkid/kanzi,rukistar/kanzi,rukistar/kanzi,sharkkid/kanzi,rzel/kanzi,sharkkid/kanzi,rzel/kanzi