Bringing framework up to PSR2 compliance.