Code refactoring.
For Travis CI - switch CI build to use OS X build environment.