Optimisation and derpy derd derp derp -sigh-

Oh shit I forgot to sign off.