nit: add braces on any new if statements please