refactor coding convention & extra variable
remove static keytword