beautification (closes #3456)