Updated comments and structure for consistency