Restructure comments