Code formatting & name changes.