Make scrutinizer happier

I applied the patches in scrutinizer and unify the `@return self` around the project.
Just to make scrutinizer happier… addresses #366