Gas Optimizations

[code423n4]

See the markdown file with the details of this report here.

[c4-judge]

berndartmueller marked the issue as grade-b