Clean up code styleguide aware (thanks srebmub), implement messageid in output for easier tracking