more improvements

what you mean the space? i have not run php_cs_fixer yet on this code, but we will in a next PR