Structure changes and comment hell