more minor phpstorm driven tidy-ups