Some beautification on the code

- @todo added to 2 unused variables
- @todo added for row where variable might default to null
- refactored variable name from Birthdate to BirthDate