few changes
removing garbage