Cleanup + add notify_admin default class property (LEV-155)