better formatting of the conditions