Code formatting fixes