Fix a few "typos"

PSR compliance and few changes which should improve readability