Update comments and formatting