Code cleanup
Bump up YARDstick threshold