Modules

Gradually enforce coding standards