Remove unecessary variables and operations, simplify things a little