[FIX] cosmetic changes'n'fixes.