Code cleanup and mark none core items.
Use proper variable name.