Cleanup

Starting to apply new code style conventions to some files.

First step: remove "open Module" lines.