Bit more cleaning up of customization