Another attempt at better formatting