cleanup / module chaining

- module chaining