Restructuring of comments and documentation step 1.