Allow passing in the shim config
Clean up whitespace