Get everything wired up correctly.  Fix style.