Use function-quoting; fix some indentation