Organised spacing and added Patrick McKenzie