Reorganize a bit
Comment and reformat module module
Bad EOF