This should be a lot better, plus I improved a load of stuff such as licence headers and type annotations and fun things like that.