Fix conditional spacing & replace typeof with _.isNumber()