moving global variables from deconvolute.h to deconvolute.c
cleaning up formatting mess