Refactor Facade/Helper Extension

Better naming, inject config instead of using Config facade.