fixed surname to deal properly with null surnames
removed unnecessary commented code