Updated comments and formatting.