Code cleanup: fix variable names, use proper data types, etc.

Merge request reports

Loading