WIP: Modernize a little bit and add types

Nsukami Patrick requested to merge topic/default/modernize into branch/default

Merge request reports