Fix filename and make methods static