[Issue #202][WIP] fixed scenario reviewer comments
[Issue #202][WIP] added to documentation in controllers and fixed docs reviewer comments
[Issue #202][Finished] fixed code according to code conventions