Try adding more consistent events into Joomla

Oh and some PHPCS stuff
Step 1: com_contact