[neo-project/neo] refactoring (#288)

@erikzhang, please, merge this into the wild! We trust you. :dagger:
It is hard to keep improving 2.x with this at hand.