Cleaned up helpers.
Merge branch 'dev/master' of github.com:ConnectAi/cornerstone into dev/master