Improvement - removed some necessary variable assignment

Improved some lines of code. Think the readability is still the same.