ugly inline translation, some little cosmetic changes