Make code style consistent