Formalize module a bit more