nit: for new code we require adding braces for single statement in if. (if it's not hard fix the statement above as well)