Homeland Security inches toward makeover