scenario comments and some refactoring