little formatting before merge