Made some variables final