Some more refactoring + wildstr optimisation