fixed text - removed funny chars
more refactoring