Improve code style and type checking

Arkerthanrequested to merge
Arkerthan/fc-pregmod:style2 into pregmod-master

Splitting them up to make review/adjustments easier.

Merge request reports