Cosmetic changes :-)
These changes have no real use, they are just for better semantics/logic
in the code.