more changes to support the travis build and remove rubocop complaints