Effect of alloy non-uniformity on optical properties of InGaN bulk and quantum wells