Style improvements, RC 1