Clean-up and tweaks of the standard edition