comments and minor restructuring