Simplifications and formatting improvements