Comments removed.
Small change to not use an IF