Keeper Goodfellow heads clear from Michael Moffat