Clean modules' source code

Don't merge for now.
What does this seem invalid to you exactly ?