Added '@' removal from word count, started organizing other analysis areas