cleanup indentation, remove dead code, rename abbreviated variables to be more meaningfull
cleanup indentation, remove dead code, rename abbreviated variables to be more meaningfull

chaubold/hytra,chaubold/hytra,chaubold/hytra