Add logic to normalize titles, and refactor Citation