Small improvements

After the if?