Style improvements, the first of many