Merge pull request #162 from g3dut1s/master

Cleanup with php-cs-fixer
Separate use statements