changing few methods to class methods