Code formatting, minor changes