Improve text analyzer
cleanup