bug-1280: Variable naming, formatting, php-syntax-error