Tweak fixes & variable name improvement