Removed junk and improved editing