Got rid of extraneous method