Added some variable initializations