cleaned up some code, working on popup "on click" module style