Small changes to make it psr-2 compliant