Minor changes so static declarations work. This way there is no unnecessary repeats of calls
Signed-off-by:john dixon <jedixon6565@gmail.com>