Fix #26 - Required ENV vars should not be empty

 * Also does small formatting cleanup from different merged styles
PHPCS PSR-2 auto fix