PSR style changes and some cleanup for better readability

Just wanted to change a little thing and ended up running wild :-)