Code formatting cleanup