Implements review suggestions
travisplexer: pr-431-linux travis ci test