Minor - content updates
Fixed duplicate email notification issue
Reorganized code