Adjust order of class functions