Fixed a zzz copy/paste inclusion
Indent correction
Merge pull request #550 from joakim-hove/rml-cleanup

Rml cleanup