Small changes & refactoring
Merge pull request #49 from atlasapi/MBST-9286-flow-improvements

Small changes & refactoring...