Various updates around version checking and PSR style guide