#518 better formatting