Formatting and small parameter changes