cleaned module and controllers