Fix a few "typos"

PSR compliance and a small changes which should improve readability