some reformatting changes after merging