fixing cs
more fixes
more fixes
beautified
cs-fixer applied