formatting & variable naming changes