[TIMOB-12590]Cleaning up code
[TIMOB-12590] Include more info in the email. Code clean up along with it.