Minor prettify update.
Minor clean up.
Started on the Contact server.