Further Optimises Code