cleaned more up