updated psr2 conformity