Code design

Code design changed using php-cs-fixer