Optimised the codebase to generate faster with no errors.