PSI: style changes and add comments