Much more optimised than the previous run, however there's still plenty of places which can be improved on.