Made some declarations local.
Made some declarations local.

jgm/lunamark,jgm/lunamark,simoncozens/lunamark,simoncozens/lunamark,tst2005/lunamark,tst2005/lunamark,jgm/lunamark,tst2005/lunamark,simoncozens/lunamark