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