Remove phantomjs
Try alternative way to start xvfb
Comment clean-up across all classes
Use (mostly) PSR-4 for all PHP code