Tidying up Controller code.
Small tidying.
v0.16.17 Use tilde instead of caret so older npms don't fall over\!