Fix indentation and pass global params