Made methods static that were referenced from static