- fixed naming of string-variables
- removed unnecessary markup