formatting
adapted to newest ssvuj