Formatting changes and fix void call