minor fix and cleaning changes

Closed Darryl Green requested to merge github/fork/etienne-lms/misc-fixes into master

Created by: etienne-lms

Merge request reports