removing unnecessary code, simplifying to single dataset