Fixing too much spaces