little formatting cleanup and enhancement