Clean up example to not import by default, and to have the correct number of vars