Some code cleanup and beginning move to using addEventListener