restructure for clarity
travis build 67