Minor:
- cleanup and convert
Fixes, cheers @EPuncker
Correction
Fixes, cheers @PrinterLUA
Merge pull request #958 from Skillert/misc

Minor: