cleaned up module definition