made some methods static

Change-Id: I19638f305b53daa181fc4437e482d54fe79b84f2