I'm aiming for consistency and removing redundancies. These changes are not yet fully tested.
makes it easier to evaluate why some are not properly processed.