Add Comments and Code refactoring
Merge pull request #9 from kugajjar/kugajjar_add_comments_and_refactored

scenario comments and some refactoring