Cleaning
NotificationEntity: typo
Venne\Comments: optimalizations