Make code consistent