I'm have deleted some variable that seemed reduntant and will delete another
as well as do some renaming seen in the next commit.