Formatting changes, compiler warnings