changed around a lot of things
removing unnecessaries