Sample data improvements 2

see commit comments for details ;-) we removed code duplication. if you don't mind we will apply the camping principle leave everything you use in a slightly better state than you found it.