some code formating
update to fit PSR-4