Cleaning up and improveing the bookmarklet