Codechanges inside code2. Some codecleanings and update headers.