- simplify FQN
- some fixes to comfort with psr2
small fixes