PSR II fixes.
Some more PSR fixes.
merge
Few more style changes.