comment, reorganization, ready for doc generation