Completed final style fixes