Clean modules' source code

Don't merge for now.