Refactor and Add full name helper