Perform code refactoring #1
- added comments
- added .DotSettings file
- fixed syntax issue