Lint codes and rename couple of variables