Small formating changes
merge