module definition and style changes

* updated module definition
* indentation, style changes