Remove empty line
Remove redundant struct field
Add comments