Replaced questionmark operator throughout