Code cleanup.
Refactor for proper naming convention……..not sure if this should make it in.