Remove unnecessary todo.
Convert blank fields to empty strings.
Tidy up the code.