example for volkswagen touran + various code cleanup/enhancements