couple of formatting clean ups, removed short-circuit ifs