Some code style fixes & renamed phpunit.xml to phpunit.xml.dist