Moved duplicate string to a variable
Removed not used config parameter
Removed PSR-1 side effects and two cgl issues with closures