code clean-up in Phar stub