import module formatting and some comment clean up