Improved the Code a bit/Removed things.