cleaned up data prep