CS fixes

- function declarations (closures in Module class)
- trailing whitespace