Changing back to methods from classes