Add comments and formatting.