Added class to all methods