Rory in 'much better headspace' entering Masters