overzealous search&replace, does not matter for functionality but fix for readability