More formatting Allman style

This reverts commit 4fb8d9af169002edb426a50ebf21e0aed8cebacf.