added numerous style changes