code cleanup in wordanalayzer