Improve module definition