product code cleanup
change to load event for faster init