refs #3074 reformat code again to look like before