Formatted
Remove comment
Add struct
Modified
Add test code