Use more readable style for class methods
Try to fix failure in travis