filemnt: Space cleanup as preoparation for further code cleanups.
Merge pull request #471 from KarlGodt/mavrothal-woof-CE-testing

Mavrothal woof ce testing