Fixed the end of Matsushita. Some code cleaning.