Style improvements, simplifications, 2.0 release