Finish refactoring transition state, add AspectJ-style logging aspect