cleanup and better seperation between express and module