substantial cleanup on styles