WHT-31 

Pull request for review from @elmariofredo 
use app.company instead so `{{ pillar['app']['company'] }}_clean`