Refactor :
* PSR-2
* Optimize imports