thx for reviewing. It seems as if I have not ran PHPCS over the files yet (WIP). 
Will check CS of my commits later.