Made some variable as final