code reformatting towards psr2