Mostly just coding style tweaks.