Style improvements...