Miscellaneous cleanup

Micael Oliveirarequested to merge
misc_cleanup into develop

Description

Several small changes to improve the code.

Merge request reports