Some code-cosmetics applied: