Tweaking O'reilly's name, adjusting some formatting