#41 tidy formatting again