Some clean up of the code and add address bar wipe