made many style changes