Updated variable declarations

Explicitly set values to null