Rename field
Remove superfluous continue statements