Code formatting, again