Code cleanup as requested

Resolving suggestions made by Marcel in code review

Author: mdtauk