Format a bit after discussion with miska