[ASalazarMX]

This kind of refactoring also greatly improves robustness and stability, very worthy if the company values those qualities in their product.