moved method, removed unnecessary method parameter