Restructure, comments