minor cleaning and refactoring
update texts