Make coding style consistent across files