cleanup

style changes
new module