Make methods static where it's possible

Change-Id: If6c1fa05044e65ec1e72a3e5f63e6db826469a2d