Some refactoring
Transactions
Update travis ruby version