Drop the var_dumps(). Some more cleanup.