Minor: should this be using Square's code formatting?  This if-return (and the next one) should be on one line if so.