Use canned styles following sbesson's suggestions.

also cleaned up some whitespace