Made static methods non-static