general code cleanup and test clean up - refactored childEventListeners