Some Refactoring, Cleanup and added Trigramizing of Articles