Improved coding style of recent changes by Charlie Vaske