Var declarations combined with initialization of var, minor IAN-TODOs taken care of