Code formatting improvements only