Mechanics: some cleanup and rename a function. this will will slightly speed up the patching progress