Tried to make the coding style consistent