Small tweakings. removed unnecessary things