Make code style more or less consistent