Code formatting simplifications