Events output: fixed properties (was missing `attachments`) + quick refactor