And removing static from the methods in the previous commit, no need for them to be static