Make changes following code review

https://github.com/pretenders/deploystream/pull/38