Make coding style consistent