Formatting
Minor changes
Adapted to latest ssvu