First/Last name fields & code clean up