phpcsmw fixes: Take 1
Merge pull request #8 from kartikm/phpcs-fixes-1

phpcsmw fixes