added getting and cleaning data