Remove unecessary variables and operations, simplify things a little

This tidies things up and makes it a more readable.