General refactoring for next release
Fix psr2