Clean-up, small tweaks