improve code consistency
travis should be able to run tests in 5.2