Removed unnecessary things, small changes