Last minute comments and reorganized the file