core reformat in psr style