Clean up the if.nils?