Clean modules' source code

Don't merge for now.
I'm not sure that this is valid.