Code formatting, minor improvements