Style changes (start for 20140609 work)