Code cleanup, added starts of 'Me' section.