2

some cleanup of popup.js