Cosmetic changes

Nothing serious, just stuff which accumulated during the last days. Should break nothing.