some initial phpcs fixes, low hanging fruit