Moved pointer * from type to the variables.
Moved variables to the top of function.
Rearranged variables in header files.