Style improvements.