undid a couple unnecessary changes