Further simplifications to the methods