Get rid of nulls and clean up a bit