contact: Code cleanup