Add TODO comment with a potential improvement/optimization
More Cosmetics
Nuke trialing whitespace
Limit scope of variables