Numerous style changes