refactoring of transition strategy concept

see issue #43