Formatting plus micro improvements

@ggrossman 


How cool is that regex? :)