Patch # increment and code formatting