Fixed broken and customer argument
Small refactors