Some updates to reduce repeat event listeners