Gwendol's suggestions seem good for the OP.