Fix #22 Auto-indent and more php-cs-fixer