Update @icemore - More readable solution