Fix: some cosmetics